From: Juanma Barranquero <lekktu@gmail.com>
Date: Tue, 5 Jun 2007 10:13:03 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18645
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=21330f4ba0fb51e52ba3b375aac2cb0dcefc3937;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3b4b72e31cc..d3ae809deda 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-05  Juanma Barranquero  <lekktu@gmail.com>
+
+	* faces.el (face-id): If the argument is a face alias,
+	return the ID of the target face.
+
 2007-06-05  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/socks.el (top): Remove unnecessary copyright line.